From a67baa51ae0222296ae0046e0ee4a95663e109c9 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 22 Jul 2014 09:42:22 +0200 Subject: [PATCH] Adwaita: stack switcher button needs-attention fix. Don't draw the dot when the stack switcher button is active. --- gtk/resources/theme/Adwaita/_common.scss | 7 ++++++- gtk/resources/theme/Adwaita/gtk-contained-dark.css | 5 ++++- gtk/resources/theme/Adwaita/gtk-contained.css | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index 08a123dba7..89fa4acacd 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -406,9 +406,14 @@ GtkLabel { to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; - background-position: right 2px, right 3px; + background-position: right 3px, right 4px; &:backdrop { background-size: 6px 6px, 0 0;} } + &.needs-attention:active > GtkLabel, + &.needs-attention:active > GtkImage { + animation: none; + background-image: none; + } } //inline-toolbar buttons diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index 23fd35916f..9270d36d32 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -508,9 +508,12 @@ background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#215d9c), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(white), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; - background-position: right 2px, right 3px; } + background-position: right 3px, right 4px; } .stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop { background-size: 6px 6px, 0 0; } + .stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage { + animation: none; + background-image: none; } .inline-toolbar .button, .inline-toolbar .button:backdrop { border-radius: 2px; border-width: 1px; } diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 1daaf3455e..adf73e2bec 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -500,9 +500,12 @@ background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#4a90d9), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(white), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; - background-position: right 2px, right 3px; } + background-position: right 3px, right 4px; } .stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop { background-size: 6px 6px, 0 0; } + .stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage { + animation: none; + background-image: none; } .inline-toolbar .button, .inline-toolbar .button:backdrop { border-radius: 2px; border-width: 1px; } -- 2.30.2